merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 12 Sep 2006 17:43:22 +0000 (11:43 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 12 Sep 2006 17:43:22 +0000 (11:43 -0600)

Trivial merge